projects
/
gtk+3.0.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fa764a
)
css: parse 'currentColor' for symbolic colors
author
Benjamin Otte
<otte@redhat.com>
Sat, 14 Jan 2012 03:05:19 +0000
(
04:05
+0100)
committer
Benjamin Otte
<otte@redhat.com>
Thu, 2 Feb 2012 02:13:38 +0000
(
03:13
+0100)
gtk/gtkcssstylefuncs.c
patch
|
blob
|
history
diff --git
a/gtk/gtkcssstylefuncs.c
b/gtk/gtkcssstylefuncs.c
index b46b9b0c9937c478ab6232de90dafe4f3e5d9f13..0045f939969880aa37ae7115767e529bba458179 100644
(file)
--- a/
gtk/gtkcssstylefuncs.c
+++ b/
gtk/gtkcssstylefuncs.c
@@
-321,9
+321,16
@@
symbolic_color_value_parse (GtkCssParser *parser,
{
GtkSymbolicColor *symbolic;
- symbolic = _gtk_css_parser_read_symbolic_color (parser);
- if (symbolic == NULL)
- return FALSE;
+ if (_gtk_css_parser_try (parser, "currentcolor", TRUE))
+ {
+ symbolic = gtk_symbolic_color_ref (_gtk_symbolic_color_get_current_color ());
+ }
+ else
+ {
+ symbolic = _gtk_css_parser_read_symbolic_color (parser);
+ if (symbolic == NULL)
+ return FALSE;
+ }
g_value_take_boxed (value, symbolic);
return TRUE;